Merge from mainline.
authorKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 6 Sep 2010 00:55:41 +0000 (00:55 +0000)
committerKatsumi Yamaoka <yamaoka@jpl.org>
Mon, 6 Sep 2010 00:55:41 +0000 (00:55 +0000)

Trivial merge